[TOOLS][POWERPC]fixes to put back commandline in prose builder
authorJimi Xenidis <jimix@watson.ibm.com>
Tue, 24 Oct 2006 23:11:00 +0000 (19:11 -0400)
committerJimi Xenidis <jimix@watson.ibm.com>
Tue, 24 Oct 2006 23:11:00 +0000 (19:11 -0400)
The following patch puts back a couple of lines of code which
copies the specified command line to the start info structure.
Must have gotten lost in prior merges.
Signed-off-by: Jonathan Appavoo <jappavoo@us.ibm.com>
Signed-off-by: Jimi Xenidis <jimix@watson.ibm.com>
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
--HG--
extra : transplant_source : %91H%F7%81m%00%BCE%A8yZQ%19%DB%99I%89J%3F%89

tools/libxc/powerpc64/xc_prose_build.c

index ae68bf1fa4bdbcbf757f07ecf3fbdf3bffd497a9..1d5bc7e0539b2f04fe3ce9d5535c4fd3b1139cd8 100644 (file)
@@ -16,6 +16,7 @@
  * Copyright (C) IBM Corporation 2006
  *
  * Authors: Hollis Blanchard <hollisb@us.ibm.com>
+ *          Jonathan Appavoo <jappavoo@us.ibm.com>
  */
 
 #include <stdio.h>
@@ -208,6 +209,9 @@ static unsigned long create_start_info(
     start_info->store_evtchn = store_evtchn;
     start_info->console.domU.mfn = (rma_top >> PAGE_SHIFT) - 3;
     start_info->console.domU.evtchn = console_evtchn;
+    strncpy((char *)start_info->cmd_line, cmdline, MAX_GUEST_CMDLINE);
+    /* just in case we truncated cmdline with strncpy add 0 at the end */
+    start_info->cmd_line[MAX_GUEST_CMDLINE-1]=0;
     start_info_addr = rma_top - 4*PAGE_SIZE;
 
     rc = ft_set_rsvmap(devtree, 0, start_info_addr, 4*PAGE_SIZE);
@@ -216,11 +220,9 @@ static unsigned long create_start_info(
         return ~0UL;
     }
 
-
     return start_info_addr;
 }
 
-
 static void free_page_array(xen_pfn_t *page_array)
 {
     free(page_array);